Auto merge of #2391 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 17 Feb 2016 18:50:52 +0000 (18:50 +0000)
committerbors <bors@rust-lang.org>
Wed, 17 Feb 2016 18:50:52 +0000 (18:50 +0000)
Fixes compile on nightly


Trivial merge